Satisfy failing tests
Add tests