Fixed naming style and broken testing