depricate older api for new API
fix tests