Added one more test, moved over all future assertions to new names
Moved over 2 more tests