adding configuration values
removing subnet and fixing tests