Fixed tests for skills1, refactoring skills2