[SQUASH ME] Fix some compiler errors
[SQUASH ME] start some tests