Merge "Refactor 16x16 unit tests"