Add tests on context + start working on base cleaning tasks