Fixed 3/4 failing tests