Updated tests & linting