rework build targets, separate tests/p2/product