Removed Should.Fluent from all tests, general refractoring