throw away old code, prepare tests