Added more tests to oracle finder. Cleaned up a lot in oracle finder.