Cleanups here and there, failing tests are actually impossible to fix so marking them as skipped with the correct reason. Closes #3