refactor .build()
fix tests due to extra newline introduced in scripts