Pushing some test cases: Nathan's changes: first bits