Took away a lot of those complex tests