More functions for Shapes (find shapes of specific types) and unit tests