This all looks great. Thanks so much! What is thrown in an end-to-end test if the number string doesn't match the pattern? Will it end up being a SQLException? Might be worth having a test like that if you don't have one already.