Add some tests, found a bug and fixed it but got poorer results