Fixed tests, renamed some directories to match task names, added new tests