End to End Test

Improved End to End Test. Not complete.