Added istanbul + updated test