added testing framework
added two extra tests