Order of tests are significant

I just don't understand why

Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>
Removed global cache - fixed problem I had

Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>
Just some cleanup

Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>