Add some test code for @andytuba