Added assertions for diff bounds test
One final merge with noctella/master