added more tests and extensions