Added more tests to solidify functionality.