Improved test functions to inlcude multiple files.