Added tests to the scheme