Cleaned up code, cranked up options to resolve weak tests