Minor bug fix
Added other test files