more updated unit tests