tests and some stuff
merge