Some new tests and merge of methods