tests added, add_skill bug fixed, refactor