Fix directory structure & fix test syntax