Adding new tests - work in progress.