Migration work
Removed filed
Added test coverage