Moved to data driven content
Added another assertion for undefined values