Start of walmgr test
Clean up naming