Fixing/cleaning up unit tests