CPU-32 unit tests now pass :)