Added dictionary generation tests for all shapes