Expects

Added expects logic, and refactored suites to allow simpler running