hacky tests, but they work
small formatting changes