Moved log to match other classes
Added router tests
Removed depricated files