Completed discovery tests; minor re-org