extended the test of restberry and fixed some bugs that came out of that