commit 2
Updated without geneics in vacsys
Updated tests