big rock minor changes and tests