Modified syntax to not use postfix notation when not in a dsl.
Update tests using fixtures to explicity import relectiveCalls
Fix for compiler warning
Updated to use new scalatest methods now that they deprecated given, when, then, & and replacing with capitalized versions.