Fixed form look
Installed test functions, refactored