added test functionality to the master branch