Added tests for base