More changes to tests..

Added a few more tests..