Update unit tests

Still need to run them and confirm they are correct