finished model tests included bonuses
resolved conlfict on week1.js