Added/removed unit tests