Tests written and marking of all but bonus works