Add tests for various methods/classes