Commiting some failing tests for Tim