refactor: Initial tests passing...
test: Add some failing tests to fix...