Cleaned up tests to accurately reflect how this shouls work