Remote Container Adapter for WLP 8.5

First crack at creating a remote adapter for WLP, tested against WLP 8.5.5.4
(a) is fine and not really a problem in my opinion; it's the same with all arquillian containers I guess. 

My question was regarding (b). You already wait for the application to be available on deployment by using your isApplicationStarted() method and I was asking whether this might also work during undeploy to wait until the isApplicationStarted() method returns false?