more changes and tests