Move FixedSize from tests to main source