Clean up + some unit test fixes