#11 Refactored tests to align with both mocha and testling