Added tests for existing functionality

fixes #1
fixes #2
fixes #3