fixed test
improvements based on feedback, now really fixed the tests