Fixed testing environment and added fields