Code pretify was done, more asserts were added to tests