Fixing incorrect comments
Better directory structure for tests