Fixed some custom tests