Removed pre-loader.

Closes #2
fixed unit tests