Tests, remove garbage #12