Changed variables names to camelcase and moved test to correct folder