some fix testing; commented out NBIC2013 demo test, which does make much sence now