added Nancy testing and re-organised