Add @andrewradev's solution and tests