Sys bio testing

More tests, and more cleanup.