updates with some custom tests