Port over more test cases