Bonus tests + minor corrections