Improve tests and check positions are correct