Add more tests. Add tests for picture method