Added simple unit test to verify (parts of) #33