Tests cleanup. Removed redundant tests, fixed tests that were broken.