Removed test code from issue #36