From dev branch
Added test files