*Changed
-refactored...

*Added
-More tests