apply review
- replace "ABCD" to "LLLLL"
- fix typo
added shapes test subdirectories to include them in the build
merge
merge