Remove old code
First tests