test class better, velocity tests coming soon