fixing / adding tests