Almost working tests :)
Code map refreshed