Updated unit tests to current specs (didn't add more)