Bug fix. First test complete.