added basic unit tests
updated todos
Merge remote-tracking branch 'origin/master' into dev