Added unit testing (a beginning)
Disabled notifications for now
Merge branch 'dev'