Undid defensive coding, instead updated tests to include correct data
formats