Adding switch to build.cmd to skip KRE install
Remove options services
Fix tests from EF changes