Extracted implementation and refactored test
Drop stored procedure