Add more tests

Fix 68