Changed included sources and added dependency for test target