Added test loading.
Whitespace cleaning.
More verbose variables names. Not sure if I like it :)