More work on Apnshit2 and tests