Fixes tests and moved them in separate folder