Dev

Revised parts of the algorithms to get data from user-defined shapes and added tests for them.