Added extra Unitetsts for test_dev and fixed problems.
All 25 tests now pass.