Feature/more functional test features