Define some new tests to fix bug