Added few methods for tests
minor changes