Adds tests and renames provider