fixed some tests not working correctly