Add missing tests

Some missing tests for #61