Added severely simplified version of test code