changed tests according to Mike's review