Fixed console scripts
removed more unneeded dependencies
renamed some test files.