Major clean ups. Fix names of results. Start better mock