Logging + cleanup
Adding runtime tests