added additional tests and got usage test working again