Added some tests to try to fire the bug