first take on valet test complete

merge it already