extract class, removed unnecessary disk access
added test points with measurement data