Fixed initial position, added test