Adding (quasi-)functional tests