Replace EmptyBrickSpinnersTest with version from master