re-work tests for new APE5 scheme
get tests working post-merge