Update test suite, notifications

* Use terminal notifier to push to OS X

* Refactor code