Removed duplicate casts and removed dynamic units from tests