Removed Metaprogramming in RSpec + added some restructuring in the code