Fixed some Issues with tests