Second commit with tests