Added file for tests; user interface usage improvements
Added tests, fixed minor bugs