adding some tests and shtuff