Fixed/Added tests