Added default test file and fixed some issues