fixed some CodeNarc violations, fixed and activated some deactived tests