Tests, bug fix, arch. agnostic sizes