Finished up the tests
Merged with previous branch