Added updated unit tests. Asynch tests still need to be completed.