revamp pt tests as well