tests passing now