fixed bug and modified test to include button