Tests; bugs eliminated