Tests refactored, now on green,
refactored to be more OOP
Update readme