use assert library; add testing for utils; reorganize