More buff component tests and bug fixes