First attempt at passing tests