Added rudimentary tests
Pass rudimentary tests