Final-ish test task written