Fixed test cleanup..
Added additional scatter chart test.
Fix for issue where comments and buttons are used together. #64