Updated to no longer use deprecated junit.framework.Assert