Adjusted tests to work properly