Tried to make unit tests more compact