More unit tests

More unit tests