Little changes in unit testing

cleaning up, basically