Move test files into test/
Merge branch 'develop'