Clean old code and full tests