Added unit tests, decision engine now working against requirements