Staged - fixing broken tests