amended two failing tests to work correctly