Complete unit tests