overhauled tests, added tests for 'add'