Remove test running from dist building as it's not really necessary.
Separate more code and get tests working.