Adding new test and bufixing