Added basic tests to try query building. Removed more useless files. Started master cleaning