clean up warnings and move spec util classes to own package