Added RLC tests
Cleaned up code, updated comments