Cleaned up tests some. removed dependencies on underscore