added test dir, small changes