First test passing in a hacky sort of way
New tests