Working on w2p test apps