Added rest of tests. Fixes #53