Added tests, hopefully resolved tests failures.