Changed test position to something reasonable, improved implementation