Adding more tests for self