Add more tests, refactor expected values