minor changes. removed tests