Added test & fixed button