updated tests.
removing old code