Fixes #4. Tests now work.