Added new test files and fixed some errors