-- Added tests