Adding more unit tests #2