Additional tests. Fixes #11 #12