Develop

Updated unit tests for EF 6 RC1 changes