Added a couple more tests, now using `__class__` syntax