Added/updated unit tests