Changes to unit tests

Should simply things in the long run