rest tests added, draw generation added