rewritten some test that were not working properly