small fixes to tests

Added master test file