WIP: Clean up tests to actual failures