Separate -tests package, some improvements/enhancements

Also added generic Record template