Added apt dependency for testing
 Fixed conflicts