fixed some minor issues with breaking tests