Hopefully one last fixes for the test cases. keep my fingers crossed