More tests + fixes for consts