Add builder
Clean unnecesary stuff from tests.js