Updated some tests. Added a few features.