Added test files, and basic tests