Started to write some tests
Minor correction in the approvable concern
Refactored some tests