More tests and starting on GUI