Separated broken tests into new test file with trivial fix - WIP