Added test code from Tech Day