Issue #61: move test directory; make necessary build changes
Issue #61: move test directory; make necessary build changes
Merge remote-tracking branch 'julry/move_test_dir' into move_test_dir
Merge pull request #229 from julry/move_test_dir

Move test dir