Added Bye & tests