refactor tests and add all basic fields