Remove extra [], add test for first-class which has no estimates