Moved tests into different folders and added some modules for testing BSR