More work on ex2, still error on one test