Debugging message for needs shows caller
Refactoring
New mock specs for shapes and save