tests cleanup + refresh last contact fixes #261