Update 3/18/14

cleaned up tests