replace literal ints with constants
break multipart test in two