Revert to better code and clean up test (#494)