Add / clean up unit tests
Clean things up