Don't build twice
Cleanup
Add more tests