adding proper testing support