Updated the second test file & fixed minor stuff