Extra credit and additional tests