Test to fix bugs