Added more tests and minor naming fixes