Added more tests and utility methods