Resolve test errors