Fix #11 - get tests to work

Tests now work but do not pass. Let me know if this is in the right direction and I'll work on getting them to pass.