more unit tests done