Added tests in base/tests