Add RSpec tests and refactor dummy structure; CR: DF

RSpec tests with Machinist. Refactor dummy structure