Added test
Added test_all method