Rewrote Jasmine tests
Added destroy method and updated unit tests
Updated unit tests
Merge branch 'tests'