Fixing / adding tests