Fixed failing test methods