Added and repaid tests