First attempt adding tests in...