remove hardcoded options
added unit test for builder function