Added proper testing of new functionality