Start pulling tests out of cross_impl_test
Test and fix PMM