Add new and extend existing tests