Update solution. Add test files.