Debugged and added some test files