Added more tests and minor naming fixes
forgot to pull, now merging