Fixed, cleaned up test, deleted old archived code