all unit and acceptances tests are now passing