Updated: refactored conversion tests and added validation to them