Tests added.
removed old tests