refactor test scripts
remove symlinked tests
Merge branch 'primitive_refactor_v2' into classes