Work in progress (added two tests)