Linting
Update unit tests