Added proper test suite

#1 fixed