Reorginize api.

- added some (really uneccessery) tests for some static methods