Concating correct files for release
Fixed bug in tests