Updated the testing files (see #18)