Move unclear and broken tests to clear(er) and working specs