Removed shape module, fixed unit tests