removed obsolete method
refactoring and simplifying API
rearranging test files so the inter-dependencies are gone