Test added, still need to fix bugs in routine