Cleaned up spec helper and enabled random testing