Remove test
Merge branch 'remove_test'