Added test dir
Samlet query argumenter inn i object
Added some docstrings
Added header comment and some line shifts