Sys fixes
add basic sys tests