Updated deps, refactored tests and bumped version...