Add provider test, fix few bugs