two tests and a bugfix