Better RSpec
Reorganize code and better tests