Remove magic number
cleanup tests