Added more tests, renamed, and conformed to a style