Adding tests to reflect stuff that was made in d4b0672407530bfcfaab64525997e8808a772c82