started adding test fixtures
some refactoring and rwd changes