Convert Tests to use Junit 4