Add new and modify existing tests