Added more tests and extensions