More tests.

- Added more tests (46)