Removed temporary test code
Added extra information to functional test