remove useless functional test code
Merge branch 'test' into alpha