These tests look a lot cleaner now ;)