removed variables left over from  previous version of custom method. added new tests and cleaned up old ones.