Removed unused files.
Fix test_utils and add more tests.