minor test and zk fix

Please merge this after #19 to avoid conflicts