adding Or spec
fixing minor bugs
replacing stub classes with mocks
adding basic tests for composite specs
initial commit