DM + RS - #107 Fix tests
DM + RS - #107 Fix tests

prisamuel/objective8,prisamuel/objective8,d-cent/objective8,ThoughtWorksInc/objective8,ThoughtWorksInc/objective8,d-cent/objective8,prisamuel/objective8,ThoughtWorksInc/objective8,d-cent/objective8,d-cent/objective8,ThoughtWorksInc/objective8,prisamuel/objective8