Bugfix/fix rspec r0

updated with rspec 3. fixed all warnings and errors.
see my comment above, the same thing applies here