Bug #15 Add tests