added 'self' method refs, deleted old test script