Finished up unit tests and provider