Added test variable
Merged some stuff