added some tests and changed user