all methods now use new API and have unit tests